uofl: changes to Open MPI and move prrte/pmix shas #13299
Conversation
Ouch - at that point, I can no longer provide support for OMPI 🤷♂️ You will be completely on your own. |
|
we decided at today's devel call that we would support |
|
need some distcheck related fixes from open-mpi/prrte#55 to fix the jenkins CI failure |
…he function directly in the process Note this commit will need to be adjusted to reset .gitmodules before merging into Open MPI main Signed-off-by: Gerardo Garcia <gagarc07@louisville.edu> Signed-off-by: Howard Pritchard <howardp@lanl.gov>
This PR adds Univ. of Louisville capstone class mods to Open MPI as well as pointing 3rd-party/prrte to sha 572d99a6da5c679a5a9c25f45e626c0e4d3e9ff3 (head of ompi_main branch of OMPI fork of prrte), and moves the 3rd-party/openpmix to be the v6.0.0 release. Signed-off-by: Howard Pritchard <howardp@lanl.gov>
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
Signed-off-by: Howard Pritchard <howardp@lanl.gov>
in which case we use the old app launch method. Signed-off-by: Howard Pritchard <howardp@lanl.gov>
|
@jsquyres take a look when you have a chance. |
being available for the selected prrte (external or internal). Signed-off-by: Howard Pritchard <howardp@lanl.gov>
|
related to open-mpi/prrte#61 . We need updates to ompi_main branch on prrte fork to get help messages working for prrte help. |
|
@jsquyres please review when you have time. we need this in main before branching 6.0.0 |
| @@ -195,6 +203,9 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [ | |||
| opal_prrte_CPPFLAGS_save="${CPPFLAGS}" | |||
| OPAL_FLAGS_APPEND_UNIQ([CPPFLAGS], [${opal_pmix_CPPFLAGS}]) | |||
| AC_DEFINE_UNQUOTED([OMPI_HAVE_PRTE_LAUNCH], [1], | |||
There was a problem hiding this comment.
This is a second, seemingly redundant, AC_DEFINE_UNQUOTED for OMPI_HAVE_PRTE_LAUNCH.
Also, is the comment correct -- is prte_launch only available in internal prte? It looks like you're testing for prte_launch in the external case, too.
| This may indicate an issue with the environment or incorrect configuration. | ||
|
|
||
| Error Message: %s | ||
|
|
There was a problem hiding this comment.
Nit: Remove blank line (because it will be emitted in the error message). If you want an effectively-blank line before the next [section], use #.
|
|
||
| return filename; | ||
| #endif | ||
| #include "3rd-party/prrte/include/prte.h" |
There was a problem hiding this comment.
Are we only supporting mpirun with the internal prte? If so, why does the configury test for prte_launch with an external prte?
|
|
||
| /* we can use prte_launch */ | ||
|
|
||
| int main(int argc, char *argv[]) |
There was a problem hiding this comment.
There's a lot of code duplication between this main and the non-prte_launch main. Is there a way to consolidate / have less code duplication?
|
|
||
| /* |
There was a problem hiding this comment.
I don't think you want to remove these copyrghts.
I think they're at the bottom of the file because MPI-enabled debuggers would default to opening the source code for mpirun.c upon attach, so we wanted to show the specific banner at the top of this file (vs. all the copyrights). But we still need the copyrights.
This PR adds Univ. of Louisville capstone class mods to Open MPI as well as pointing 3rd-party/prrte to
sha 572d99a6da5c679a5a9c25f45e626c0e4d3e9ff3 (head of ompi_main branch of OMPI fork of prrte),
and moves the 3rd-party/openpmix to be the v6.0.0 release.
Based on follow-on discussions the UofL configury refactor to not allow external PRRTE was removed.
External PRRTE is allowed and the old launch method is used in that case.